From 167feff85e85103f982fbecc79733bedb8a6c2e9 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Mitsuharu Date: Sun, 15 Jan 2012 10:55:52 +0800 Subject: [PATCH] Fix wrong font metrics for mouse highlight (backport 106677 from trunk) * src/xftfont.c (xftfont_draw): Use the font metrics of s->font to fill background (Bug#8992). --- src/ChangeLog | 5 +++++ src/xftfont.c | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/ChangeLog b/src/ChangeLog index 88b7739f0ee..bd024b369ff 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2012-01-15 YAMAMOTO Mitsuharu + + * xftfont.c (xftfont_draw): Use the font metrics of s->font to + fill background (Bug#8992). + 2012-01-13 Kenichi Handa * character.c (char_width): New function. diff --git a/src/xftfont.c b/src/xftfont.c index 935a7319a60..aa31fd9d868 100644 --- a/src/xftfont.c +++ b/src/xftfont.c @@ -689,7 +689,7 @@ xftfont_draw (s, from, to, x, y, with_background) if (with_background) XftDrawRect (xft_draw, &bg, - x, y - face->font->ascent, s->width, face->font->height); + x, y - s->font->ascent, s->width, s->font->height); code = alloca (sizeof (FT_UInt) * len); for (i = 0; i < len; i++) code[i] = ((XCHAR2B_BYTE1 (s->char2b + from + i) << 8) -- 2.30.2